From ae5f05ef2049b9761519e5c6843c4657871996c1 Mon Sep 17 00:00:00 2001 From: "ydroneaud@mandriva.com[kaf24]" Date: Tue, 3 May 2005 16:30:40 +0000 Subject: [PATCH] bitkeeper revision 1.1159.258.112 (4277a730mvnFSFXrxJpVRNk8hjD4Vg) [PATCH] Mkbuildtree little fix Hi, here is a really small fix for mkbuildtree. With my 'find' version [1], I get many of these warning when using mkbuildtree: find: warning: you have specified the -maxdepth option after a non-option argument -type, but options are not positional (-maxdepth affects tests specified before it as well as those specified after it). Please specify options before other arguments. My patch just correct the ordering of the options, it should be harmless, but I didn't test with other versions of find. Regards [1] find --version GNU find version 4.2.20 Features enabled: D_TYPE O_NOFOLLOW(enabled) xen-unstable-mkbuildtree-find-maxpath.patch: --- BitKeeper/etc/logging_ok | 1 + linux-2.4.29-xen-sparse/mkbuildtree | 2 +- linux-2.6.11-xen-sparse/mkbuildtree | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index eff426464d..90b505243e 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -73,3 +73,4 @@ tw275@striker.cl.cam.ac.uk vh249@airwolf.cl.cam.ac.uk vh249@arcadians.cl.cam.ac.uk xenbk@gandalf.hpl.hp.com +ydroneaud@mandriva.com diff --git a/linux-2.4.29-xen-sparse/mkbuildtree b/linux-2.4.29-xen-sparse/mkbuildtree index f72b2cd7b1..acf4fb2f85 100755 --- a/linux-2.4.29-xen-sparse/mkbuildtree +++ b/linux-2.4.29-xen-sparse/mkbuildtree @@ -66,7 +66,7 @@ relative_lndir () ( cd $i pref=`echo $i | sed -e 's#/[^/]*#../#g' -e 's#^\.##'` - for j in `find . -type f -o -type l -maxdepth 1`; do + for j in `find . -maxdepth 1 -type f -o -type l`; do ln -sf ${pref}${REAL_DIR}/$i/$j ${SYMLINK_DIR}/$i/$j done ) diff --git a/linux-2.6.11-xen-sparse/mkbuildtree b/linux-2.6.11-xen-sparse/mkbuildtree index 8ab2d42a7c..3556506d6d 100755 --- a/linux-2.6.11-xen-sparse/mkbuildtree +++ b/linux-2.6.11-xen-sparse/mkbuildtree @@ -66,7 +66,7 @@ relative_lndir () ( cd $i pref=`echo $i | sed -e 's#/[^/]*#../#g' -e 's#^\.##'` - for j in `find . -type f -o -type l -maxdepth 1`; do + for j in `find . -maxdepth 1 -type f -o -type l`; do ln -sf ${pref}${REAL_DIR}/$i/$j ${SYMLINK_DIR}/$i/$j done ) -- 2.30.2